From b8a6ebea7c4345f421363c1a4a242fdcdf82ef6e Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Mon, 20 Apr 2015 18:36:10 +0200 Subject: [PATCH] Adwaita: simplify entries. By drawing the background w/o using 3 inset shadows, same or better effect, cleaner and simpler scss, possibly better rendering performances. --- gtk/theme/Adwaita/_drawing.scss | 36 ++++---- gtk/theme/Adwaita/gtk-contained-dark.css | 100 +++++++++++------------ gtk/theme/Adwaita/gtk-contained.css | 100 +++++++++++------------ 3 files changed, 115 insertions(+), 121 deletions(-) diff --git a/gtk/theme/Adwaita/_drawing.scss b/gtk/theme/Adwaita/_drawing.scss index 561393c740..34fa8c72ca 100644 --- a/gtk/theme/Adwaita/_drawing.scss +++ b/gtk/theme/Adwaita/_drawing.scss @@ -29,7 +29,12 @@ } @function entry_gradient($c) { - @return linear-gradient(to bottom, darken($c,3%), $c 90%); + @if $variant=='light' { @return linear-gradient(to bottom, mix($borders_color, $c, 35%), + mix($borders_color, $c, 7%) 3px, + $c 90%); } + @else { @return linear-gradient(to bottom, mix($borders_color, $c, 95%), + mix($borders_color, $c, 40%) 3px, + $c 90%); } } @mixin entry($t, $fc:$selected_bg_color, $edge: $borders_edge) { @@ -44,51 +49,40 @@ // possible $t values: // normal, focus, insensitive, backdrop, backdrop-insensitive, osd, osd-focus, osd-backdrop; // + background-color: transparent; background-image: entry_gradient($base_color); $_blank_edge: if($edge == none, none, 0 1px transparentize($edge,1)); $_entry_edge: if($edge == none, none, _widget_edge($edge)); - $_inner_shadows: inset 0 3px transparentize(black, 0.98), - inset 0 2px transparentize(black, 0.97), - inset 0 1px transparentize(black, 0.92); - - // we need to match the same shadow types (inset/outset) in various states - // hence transparent shadows istead of resetting them when not needed - $_blank_inner_shadows: inset 0 3px transparentize(black, 1), - inset 0 2px transparentize(black, 1), - inset 0 1px transparentize(black, 1); + @if $t==normal { color: $text_color; border-color: $borders_color; - @include _shadows($_inner_shadows, - entry_focus_shadow(transparentize($fc,1)), - $_entry_edge); - // the second transparent shadow is needed for the transition to work + @include _shadows(entry_focus_shadow(transparentize($fc,1)), $_entry_edge); + // for the transition to work the number of shadows in different states needs to match, hence the transparent shadow here. } @if $t==focus { - @include _shadows($_inner_shadows, - entry_focus_shadow($fc), - $_entry_edge); + @include _shadows(entry_focus_shadow($fc), $_entry_edge); border-color: entry_focus_border($fc); } @if $t==insensitive { color: $insensitive_fg_color; border-color: $borders_color; background-image: linear-gradient(to bottom, $insensitive_bg_color); - @include _shadows($_blank_inner_shadows, $_entry_edge); + box-shadow: $_entry_edge; } @if $t==backdrop { color: $backdrop_text_color; border-color: $backdrop_borders_color; background-image: linear-gradient(to bottom, $backdrop_base_color); - @include _shadows($_blank_inner_shadows, $_blank_edge); + box-shadow: $_blank_edge; } @if $t==backdrop-insensitive { color: $backdrop_insensitive_color; border-color: $backdrop_borders_color; background-image: linear-gradient(to bottom, $insensitive_bg_color); - @include _shadows($_blank_inner_shadows, $_blank_edge); + box-shadow: $_blank_edge; } @if $t==osd { color: $osd_text_color; @@ -104,7 +98,7 @@ border-color: $selected_bg_color; background-image: linear-gradient(to bottom, transparentize(opacify($osd_borders_color, 1), 0.5)); background-clip: padding-box; - box-shadow: entry_focus_shadow($selected_bg_color); + box-shadow: entry_focus_shadow($fc); text-shadow: 0 1px black; icon-shadow: 0 1px black; } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 278b4d15e2..529ccc53fc 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -158,10 +158,10 @@ GtkTextView { border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: white; border-color: #1c1f1f; - box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); } + box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); } .entry.image.left { padding-left: 0; } .entry.image.right { @@ -169,38 +169,38 @@ GtkTextView { .entry.flat, .entry.flat:focus { padding: 2px; background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: white; border-color: #1c1f1f; - box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0); + box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0); border: none; border-radius: 0; } .entry:focus { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); - box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px #215d9c, 0 1px rgba(238, 238, 236, 0.1); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); + box-shadow: inset 0 0 0 1px #215d9c, 0 1px rgba(238, 238, 236, 0.1); border-color: #0f2b48; } .entry:insensitive { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: #939695; border-color: #1c1f1f; background-image: linear-gradient(to bottom, #323636); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0.1); } + box-shadow: 0 1px rgba(238, 238, 236, 0.1); } .entry:backdrop { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: #d4d4d4; border-color: #1e2222; background-image: linear-gradient(to bottom, #2c2c2c); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); } + box-shadow: 0 1px rgba(238, 238, 236, 0); } .entry:backdrop:insensitive { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: #5d6767; border-color: #1e2222; background-image: linear-gradient(to bottom, #323636); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); } + box-shadow: 0 1px rgba(238, 238, 236, 0); } .entry.progressbar { margin: 1px; border-radius: 0; @@ -230,8 +230,8 @@ GtkTextView { border-color: #cc0000; } .entry.error:focus { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); - box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px #cc0000, 0 1px rgba(238, 238, 236, 0.1); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); + box-shadow: inset 0 0 0 1px #cc0000, 0 1px rgba(238, 238, 236, 0.1); border-color: #1a0000; } .entry.error:selected, .entry.error:selected:focus { background-color: #cc0000; } @@ -240,8 +240,8 @@ GtkTextView { border-color: #f57900; } .entry.warning:focus { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); - box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px #f57900, 0 1px rgba(238, 238, 236, 0.1); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); + box-shadow: inset 0 0 0 1px #f57900, 0 1px rgba(238, 238, 236, 0.1); border-color: #432100; } .entry.warning:selected, .entry.warning:selected:focus { background-color: #f57900; } @@ -255,10 +255,10 @@ GtkTextView { color: #7e8080; } .linked.vertical > .entry { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: white; border-color: #1c1f1f; - box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0); + box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0); background-image: linear-gradient(to bottom, #292929); border-bottom-color: #252626; box-shadow: none; } @@ -267,71 +267,71 @@ GtkTextView { box-shadow: inset 0 0 0 1px #215d9c, 0 -1px 0 0 #0f2b48; } .linked.vertical > .entry:insensitive { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: #939695; border-color: #1c1f1f; background-image: linear-gradient(to bottom, #323636); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent; + box-shadow: none; border-bottom-color: #252626; } .linked.vertical > .entry:insensitive:backdrop { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: #5d6767; border-color: #1e2222; background-image: linear-gradient(to bottom, #323636); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent; + box-shadow: none; border-bottom-color: #272929; } .linked.vertical > .entry:backdrop { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: #d4d4d4; border-color: #1e2222; background-image: linear-gradient(to bottom, #2c2c2c); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent; + box-shadow: none; border-bottom-color: #272929; } .linked.vertical > .entry:first-child { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: white; border-color: #1c1f1f; - box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0); + box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0); border-bottom-color: #252626; } .linked.vertical > .entry:first-child:focus { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); - box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px #215d9c; + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); + box-shadow: inset 0 0 0 1px #215d9c; border-color: #0f2b48; } .linked.vertical > .entry:first-child:insensitive { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: #939695; border-color: #1c1f1f; background-image: linear-gradient(to bottom, #323636); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent; + box-shadow: none; border-bottom-color: #272929; } .linked.vertical > .entry:first-child:insensitive:backdrop { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: #5d6767; border-color: #1e2222; background-image: linear-gradient(to bottom, #323636); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent; + box-shadow: none; border-bottom-color: #272929; border-top-style: solid; } .linked.vertical > .entry:first-child:backdrop { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: #d4d4d4; border-color: #1e2222; background-image: linear-gradient(to bottom, #2c2c2c); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent; + box-shadow: none; border-bottom-color: #272929; } .linked.vertical > .entry:last-child { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: white; border-color: #1c1f1f; - box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); + box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); background-image: linear-gradient(to bottom, #292929); box-shadow: 0 1px rgba(238, 238, 236, 0.1); } .linked.vertical > .entry:last-child:focus { @@ -339,28 +339,28 @@ GtkTextView { box-shadow: inset 0 0 0 1px #215d9c, 0 -1px 0 0 #0f2b48, 0 1px rgba(238, 238, 236, 0.1); } .linked.vertical > .entry:last-child:insensitive { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: #939695; border-color: #1c1f1f; background-image: linear-gradient(to bottom, #323636); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0.1); } + box-shadow: 0 1px rgba(238, 238, 236, 0.1); } .linked.vertical > .entry:last-child:insensitive:backdrop { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: #5d6767; border-color: #1e2222; background-image: linear-gradient(to bottom, #323636); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); } + box-shadow: 0 1px rgba(238, 238, 236, 0); } .linked.vertical > .entry:last-child:backdrop { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: #d4d4d4; border-color: #1e2222; background-image: linear-gradient(to bottom, #2c2c2c); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); } + box-shadow: 0 1px rgba(238, 238, 236, 0); } .osd .entry { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: white; border-color: rgba(0, 0, 0, 0.7); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5)); @@ -370,7 +370,7 @@ GtkTextView { icon-shadow: 0 1px black; } .osd .entry:focus { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: white; border-color: #215d9c; background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5)); @@ -380,7 +380,7 @@ GtkTextView { icon-shadow: 0 1px black; } .osd .entry:backdrop { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: white; border-color: rgba(0, 0, 0, 0.7); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5)); @@ -390,7 +390,7 @@ GtkTextView { icon-shadow: none; } .osd .entry:insensitive { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: #878989; border-color: rgba(0, 0, 0, 0.7); background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5)); @@ -3473,17 +3473,17 @@ GtkProgressBar { padding: 2px; border-radius: 3px; background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: white; border-color: #1c1f1f; - box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); } + box-shadow: inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); } .level-bar.trough:backdrop { background-color: transparent; - background-image: linear-gradient(to bottom, #212121, #292929 90%); + background-image: linear-gradient(to bottom, #1c1f1f, #232525 3px, #292929 90%); color: #d4d4d4; border-color: #1e2222; background-image: linear-gradient(to bottom, #2c2c2c); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); } + box-shadow: 0 1px rgba(238, 238, 236, 0); } .level-bar.fill-block { border: 1px solid #1c5187; background-color: #215d9c; diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index eff45e3351..8d33910e24 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -158,10 +158,10 @@ GtkTextView { border-radius: 3px; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: black; border-color: #a1a1a1; - box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; } + box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; } .entry.image.left { padding-left: 0; } .entry.image.right { @@ -169,38 +169,38 @@ GtkTextView { .entry.flat, .entry.flat:focus { padding: 2px; background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: black; border-color: #a1a1a1; - box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0); + box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0); border: none; border-radius: 0; } .entry:focus { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); - box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px #4a90d9, 0 1px white; + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); + box-shadow: inset 0 0 0 1px #4a90d9, 0 1px white; border-color: #4a90d9; } .entry:insensitive { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: #8d9091; border-color: #a1a1a1; background-image: linear-gradient(to bottom, #f4f4f4); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px white; } + box-shadow: 0 1px white; } .entry:backdrop { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: #323232; border-color: #a8a8a8; background-image: linear-gradient(to bottom, white); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); } + box-shadow: 0 1px rgba(255, 255, 255, 0); } .entry:backdrop:insensitive { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: #c7c7c7; border-color: #a8a8a8; background-image: linear-gradient(to bottom, #f4f4f4); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); } + box-shadow: 0 1px rgba(255, 255, 255, 0); } .entry.progressbar { margin: 1px; border-radius: 0; @@ -230,8 +230,8 @@ GtkTextView { border-color: #cc0000; } .entry.error:focus { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); - box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px #cc0000, 0 1px white; + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); + box-shadow: inset 0 0 0 1px #cc0000, 0 1px white; border-color: #cc0000; } .entry.error:selected, .entry.error:selected:focus { background-color: #cc0000; } @@ -240,8 +240,8 @@ GtkTextView { border-color: #f57900; } .entry.warning:focus { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); - box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px #f57900, 0 1px white; + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); + box-shadow: inset 0 0 0 1px #f57900, 0 1px white; border-color: #f57900; } .entry.warning:selected, .entry.warning:selected:focus { background-color: #f57900; } @@ -255,10 +255,10 @@ GtkTextView { color: #a3a6a7; } .linked.vertical > .entry { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: black; border-color: #a1a1a1; - box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0); + box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0); background-image: linear-gradient(to bottom, #ffffff); border-bottom-color: #e2e2e2; box-shadow: none; } @@ -267,71 +267,71 @@ GtkTextView { box-shadow: inset 0 0 0 1px #4a90d9, 0 -1px 0 0 #4a90d9; } .linked.vertical > .entry:insensitive { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: #8d9091; border-color: #a1a1a1; background-image: linear-gradient(to bottom, #f4f4f4); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent; + box-shadow: none; border-bottom-color: #e2e2e2; } .linked.vertical > .entry:insensitive:backdrop { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: #c7c7c7; border-color: #a8a8a8; background-image: linear-gradient(to bottom, #f4f4f4); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent; + box-shadow: none; border-bottom-color: #e4e4e4; } .linked.vertical > .entry:backdrop { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: #323232; border-color: #a8a8a8; background-image: linear-gradient(to bottom, white); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent; + box-shadow: none; border-bottom-color: #e4e4e4; } .linked.vertical > .entry:first-child { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: black; border-color: #a1a1a1; - box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0); + box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0); border-bottom-color: #e2e2e2; } .linked.vertical > .entry:first-child:focus { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); - box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px #4a90d9; + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); + box-shadow: inset 0 0 0 1px #4a90d9; border-color: #4a90d9; } .linked.vertical > .entry:first-child:insensitive { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: #8d9091; border-color: #a1a1a1; background-image: linear-gradient(to bottom, #f4f4f4); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent; + box-shadow: none; border-bottom-color: #e4e4e4; } .linked.vertical > .entry:first-child:insensitive:backdrop { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: #c7c7c7; border-color: #a8a8a8; background-image: linear-gradient(to bottom, #f4f4f4); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent; + box-shadow: none; border-bottom-color: #e4e4e4; border-top-style: solid; } .linked.vertical > .entry:first-child:backdrop { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: #323232; border-color: #a8a8a8; background-image: linear-gradient(to bottom, white); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent; + box-shadow: none; border-bottom-color: #e4e4e4; } .linked.vertical > .entry:last-child { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: black; border-color: #a1a1a1; - box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; + box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; background-image: linear-gradient(to bottom, #ffffff); box-shadow: 0 1px white; } .linked.vertical > .entry:last-child:focus { @@ -339,28 +339,28 @@ GtkTextView { box-shadow: inset 0 0 0 1px #4a90d9, 0 -1px 0 0 #4a90d9, 0 1px white; } .linked.vertical > .entry:last-child:insensitive { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: #8d9091; border-color: #a1a1a1; background-image: linear-gradient(to bottom, #f4f4f4); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px white; } + box-shadow: 0 1px white; } .linked.vertical > .entry:last-child:insensitive:backdrop { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: #c7c7c7; border-color: #a8a8a8; background-image: linear-gradient(to bottom, #f4f4f4); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); } + box-shadow: 0 1px rgba(255, 255, 255, 0); } .linked.vertical > .entry:last-child:backdrop { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: #323232; border-color: #a8a8a8; background-image: linear-gradient(to bottom, white); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); } + box-shadow: 0 1px rgba(255, 255, 255, 0); } .osd .entry { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: white; border-color: rgba(0, 0, 0, 0.7); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5)); @@ -370,7 +370,7 @@ GtkTextView { icon-shadow: 0 1px black; } .osd .entry:focus { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: white; border-color: #4a90d9; background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5)); @@ -380,7 +380,7 @@ GtkTextView { icon-shadow: 0 1px black; } .osd .entry:backdrop { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: white; border-color: rgba(0, 0, 0, 0.7); background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5)); @@ -390,7 +390,7 @@ GtkTextView { icon-shadow: none; } .osd .entry:insensitive { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: #878989; border-color: rgba(0, 0, 0, 0.7); background-image: linear-gradient(to bottom, rgba(52, 57, 57, 0.5)); @@ -3635,17 +3635,17 @@ GtkProgressBar { padding: 2px; border-radius: 3px; background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: black; border-color: #a1a1a1; - box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 0.08), inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; } + box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; } .level-bar.trough:backdrop { background-color: transparent; - background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%); + background-image: linear-gradient(to bottom, #dedede, #f8f8f8 3px, #ffffff 90%); color: #323232; border-color: #a8a8a8; background-image: linear-gradient(to bottom, white); - box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); } + box-shadow: 0 1px rgba(255, 255, 255, 0); } .level-bar.fill-block { border: 1px solid #2a76c6; background-color: #4a90d9; -- 2.30.2